Merge sc-mainline-prod Bug: 189946434 Change-Id: Ied55fdd82309ce4fef9a28daed547f7605f6b164